Removed dependency on BEAN module