Added constant
Removed non serializable object