Added lazy: and attribute support