Bug fixes

Added support to custom attributes