Added entity support! :)