Add more attributes too models and use internal resources