Implement better embbedded behavior