Added layer checks and reorganize a little the code
Added layer checks and reorganize a little the code


marcosptf/pear-core,marcosptf/pear-core,marcosptf/pear-core,marcosptf/pear-core,marcosptf/pear-core,marcosptf/pear-core